From: Christoph Egger <Christoph.Egger@amd.com>
Date: Mon, 25 Jun 2012 09:18:23 +0000 (+0100)
Subject: Fix check if guest enabled nested paging.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8307
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=b1719daed04ad9611dec60a3c42557659870c386;p=xen.git

Fix check if guest enabled nested paging.

Fixes crashes with Windows guests when shadow-on-nested is used.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c
index 6ed32604cf..0b6ff88672 100644
--- a/xen/arch/x86/hvm/svm/nestedsvm.c
+++ b/xen/arch/x86/hvm/svm/nestedsvm.c
@@ -935,6 +935,9 @@ nsvm_vmcb_guest_intercepts_exitcode(struct vcpu *v,
         return 0;
 
     case VMEXIT_NPF:
+        if (nestedhvm_paging_mode_hap(v))
+            break;
+        return 0;
     case VMEXIT_INVALID:
         /* Always intercepted */
         break;